Perform RexNode expression standardization for script push down. #4795
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Heng Qian <[email protected]>
Signed-off-by: Heng Qian <[email protected]>
Signed-off-by: Heng Qian <[email protected]>
Signed-off-by: Heng Qian <[email protected]>
…ardization # Conflicts: # integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java # integ-test/src/test/resources/expectedOutput/calcite/explain_agg_script_udt_arg_push.yaml # integ-test/src/test/resources/expectedOutput/calcite/explain_regexp_match_in_where.json # opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/context/PushDownContext.java
Signed-off-by: Heng Qian <[email protected]>
qianheng-aws
requested review from
GumpacG,
LantaoJin,
MaxKsyunz,
RyanL1997,
Swiddis,
YANG-DB,
Yury-Fridlyand,
acarbonetto,
anirudha,
dai-chen,
derek-ho,
forestmvey,
joshuali925,
kavithacm,
mengweieric,
noCharger,
penghuo,
ps48,
seankao-az,
vamsimanohar,
ykmr1224 and
yuancu
as code owners
Signed-off-by: Heng Qian <[email protected]>
penghuo
reviewed
Nov 14, 2025
...c/main/java/org/opensearch/sql/opensearch/storage/scan/context/AggregationBuilderAction.java
Show resolved
Hide resolved
...search/src/main/java/org/opensearch/sql/opensearch/storage/scan/context/PushDownContext.java
Show resolved
Hide resolved
opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/CalciteScriptEngine.java
Outdated
Show resolved
Hide resolved
Comment on lines
+207
to
+211
| return switch (sources.get(index)) { | ||
| case DOC_VALUE -> getFromDocValue((String) digests.get(index)); | ||
| case SOURCE -> getFromSource((String) digests.get(index)); | ||
| case LITERAL -> getFromLiteral((Integer) digests.get(index)); | ||
| }; |
Collaborator
There was a problem hiding this comment.
could u add a developer doc to explain the spec of pushdown script, after encoding, is not easy to read I guess.
Collaborator
There was a problem hiding this comment.
Thanks. It is very clear.
Nit: Is Literals array necessary? DIGESTS and LITERALS can combined?
"params": {
"utcTimestamp": 17630261838681530000,
"SOURCES": [0, 2, 2, 1],
"DIGESTS": ["age", 0, 1, "email"],
"LITERALS": [35, "u35"]
}
vs
"params": {
"utcTimestamp": 17630261838681530000,
"SOURCES": [0, 2, 2, 1],
"DIGESTS": ["age", 35, "u35", "email"]
}
opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/CalciteScriptEngine.java
Show resolved
Hide resolved
opensearch/src/main/java/org/opensearch/sql/opensearch/util/OpenSearchRelOptUtil.java
Show resolved
Hide resolved
Signed-off-by: Heng Qian <[email protected]>
…ardization # Conflicts: # integ-test/src/test/resources/expectedOutput/calcite/explain_eval_min.yaml # integ-test/src/test/resources/expectedOutput/calcite_no_pushdown/explain_eval_min.yaml
Signed-off-by: Heng Qian <[email protected]>
Signed-off-by: Heng Qian <[email protected]>
Signed-off-by: Heng Qian <[email protected]>
Signed-off-by: Heng Qian <[email protected]>
penghuo
reviewed
Nov 14, 2025
| SerializationWrapper.wrapWithLangType( | ||
| ScriptEngineType.CALCITE, serializer.serialize(rexNode, rowType, fieldTypes)); | ||
| ScriptEngineType.CALCITE, | ||
| serializer.serialize(rexNode, rowType, fieldTypes, sources, digests, literals)); |
Collaborator
There was a problem hiding this comment.
why include sources, digests, literals as paramater in serialize() function and client create empty array?
Collaborator
There was a problem hiding this comment.
I see. It is required when create Script on L1504.
I also found sources, digests, literals exposed been used in multiple place without encapsulation. e.g. ScriptDataContext and standardizeRexNodeExpression.
can we encapsulate our script protocol in a class? e.g.
class ParameterBindings {
void putValue(String name, Object value)
Object getValue(String name)
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR includes changes:
ROW_TYPEandEXPR_MAPin our script. Then the average script size can be reduced by 2 to 5 times than before.OpenSearchRequestBuilderwhen computing digest forOpenSearchIndexScanOperator, while keep it when generating explain plan.OpenSearchRequestBuilderinPushDownContextand make the related action lazy perform. Since we have change 3, it's less valuable to hold that object in eachPushDownContext.Related Issues
Partly resolves #4757
Check List
--signoffor-s.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.